From 30ac073dd4e8ed1867b6a38ccb4e36bd7c31d978 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 1 Sep 2015 18:43:48 +0200 Subject: [PATCH] Adwaita: contemplate selected insensitive items. --- gtk/theme/Adwaita/_common.scss | 12 +++++++++++- gtk/theme/Adwaita/gtk-contained-dark.css | 6 ++++++ gtk/theme/Adwaita/gtk-contained.css | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 3953c0c8f6..1f13b4278f 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2902,6 +2902,10 @@ GtkPlacesSidebar.sidebar { // in the sidebar case it makes no sense to click the selected row .list-row:selected:active { box-shadow: none; } + // looks like the label doesn't get all the states so work around + .list-row:selected:insensitive .label { @extend %selected_items:insensitive; } + .list-row:selected:backdrop:insensitive .label { @extend %selected_items:backdrop:insensitive; } + .sidebar-placeholder-row { border: solid 1px $selected_bg_color; } @@ -3298,7 +3302,13 @@ GtkVolumeButton.button { @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); } - &:backdrop { color: $backdrop_selected_fg_color; } + &:insensitive { color: mix($selected_fg_color, $selected_bg_color, 50%); } + &:backdrop { + color: $backdrop_selected_fg_color; + &:insensitive { + color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); + } + } } .monospace { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 4a4b7117f3..62aacf4c50 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4312,9 +4312,15 @@ GtkColorSwatch { .titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected { background-color: #215d9c; color: #ffffff; } + .view:insensitive:selected, GtkCalendar:insensitive:selected, .label:insensitive:selected, .grid-child:insensitive:selected, .entry:insensitive:selected, .menuitem.button.flat:insensitive:selected, .menuitem.sidebar-button.button:insensitive:selected, .header-bar .menuitem.titlebutton.button:insensitive:selected, + .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive .label { + color: #90aece; } .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected, .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected { color: #ffffff; } + .view:backdrop:insensitive:selected, GtkCalendar:backdrop:insensitive:selected, .label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, .entry:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .menuitem.sidebar-button.button:backdrop:insensitive:selected, .header-bar .menuitem.titlebutton.button:backdrop:insensitive:selected, + .titlebar .menuitem.titlebutton.button:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive .label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive .label { + color: #648eba; } .monospace { font: Monospace; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 8824f97f95..99bb8aad03 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4485,9 +4485,15 @@ GtkColorSwatch { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } + .view:insensitive:selected, GtkCalendar:insensitive:selected, .label:insensitive:selected, .grid-child:insensitive:selected, .entry:insensitive:selected, .menuitem.button.flat:insensitive:selected, .menuitem.sidebar-button.button:insensitive:selected, .header-bar .menuitem.titlebutton.button:insensitive:selected, + .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive .label { + color: #a5c8ec; } .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected, .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected { color: #ffffff; } + .view:backdrop:insensitive:selected, GtkCalendar:backdrop:insensitive:selected, .label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, .entry:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .menuitem.sidebar-button.button:backdrop:insensitive:selected, .header-bar .menuitem.titlebutton.button:backdrop:insensitive:selected, + .titlebar .menuitem.titlebutton.button:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive .label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive .label { + color: #80b1e4; } .monospace { font: Monospace; } -- 2.30.2